*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f41996d6eda2ce9340677a5969796c7139552f4..4a57dcd04ad8fded6f38600b06a74485a48ed5ca 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
 
        * button.el (button): Use color for this face on a tty.
 
+       * files.el (magic-mode-alist): Allow for carriage-returns in
+       html-mode entry.
+
 2007-04-22  Richard Stallman  <rms@gnu.org>
 
        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode):